From 8e65935993b57c354e7fd52284672c7d9f49a729 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Wed, 3 Sep 2014 19:09:50 +0400 Subject: [PATCH] ffix build on nightly rust --- src/cargo/core/source.rs | 6 +++--- src/cargo/util/errors.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs index 1a92b6052..1335293c3 100644 --- a/src/cargo/core/source.rs +++ b/src/cargo/core/source.rs @@ -291,14 +291,14 @@ impl<'a> SourceMap<'a> { let source = self.map.find(id); source.map(|s| { - let s: &Source+'a = *s; + let s: &Source+'a = &**s; s }) } pub fn get_mut(&mut self, id: &SourceId) -> Option<&mut Source+'a> { self.map.find_mut(id).map(|s| { - let s: &mut Source+'a = *s; + let s: &mut Source+'a = &mut **s; s }) } @@ -320,7 +320,7 @@ impl<'a> SourceMap<'a> { } pub fn sources_mut(&'a mut self) -> SourcesMut<'a> { - self.map.mut_iter().map(|(_, v)| { let s: &mut Source+'a = *v; s }) + self.map.mut_iter().map(|(_, v)| { let s: &mut Source+'a = &mut **v; s }) } } diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs index a33ca305c..e4f7c9287 100644 --- a/src/cargo/util/errors.rs +++ b/src/cargo/util/errors.rs @@ -197,7 +197,7 @@ impl CargoError for ProcessError { } fn cause(&self) -> Option<&CargoError> { - self.cause.as_ref().map(|c| { let err: &CargoError = *c; err }) + self.cause.as_ref().map(|c| { let err: &CargoError = &**c; err }) } fn with_cause(mut self, @@ -230,7 +230,7 @@ impl CargoError for ConcreteCargoError { } fn cause(&self) -> Option<&CargoError> { - self.cause.as_ref().map(|c| { let err: &CargoError = *c; err }) + self.cause.as_ref().map(|c| { let err: &CargoError = &**c; err }) } fn with_cause(mut self, -- 2.30.2